Merged.
authoremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Thu, 4 May 2006 13:19:19 +0000 (14:19 +0100)
committeremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Thu, 4 May 2006 13:19:19 +0000 (14:19 +0100)

Trivial merge